Some fixes to conglomeration stuff.

Discovered while integrating with datagrepper.