Slight speed improvements to entity_record_collection.