Fixed a bug in how collections are gotten from the event. Also split up the
object selectors into separate files so they can be compiled in parallel.