Redo some formatting.

Move the enums around, and put the log messages in the methods
that they correspond to.