Hardens up the logic in the front end that chooses whether to use bootstrapped records or to piggyback on the map collection.