Cleanups.
Move the record merger to the module that says it contains it