Refactored out layouts, and most of the hiccupery.

This should leave things in a suitable state for a possible transition
to enlive.
Removed noisy log message.