Robustify `ReferenceableMap`

[matthandlersux]

this should be a light wrapper around a Map that handles adding new Referenceables and assigning identifiers to them (this will help prevent collisions in predicate conditions and move some of the map building logic out of Query