Sanne Grinovero, Ståle W. Pedersen, Andrig T Miller, any more thoughts on this one? Would a single setting for StatefulPersistenceContext's maps be a decent starting point? Is more granularity needed? Heuristics (not sure what they would look like)?