In preparation for some Lilliput-related changes, I'd like to get some purely mechanical code moves out of the way. It would also improve separation of concerns and reduces include header bloat.