New strategy for collection definitions, and committed to making heap-maps versioned just like everything else (though with an unfortunate O(n) cursor operation, I think). This should simplify the design a lot going forwards.