Minor re-organization

Moved some definitions around in an attempt to keep related things a
little closer together. Removed an unnecessary callback.