Simple cleanup

Tiny checkin. Thought about process managers, but will delay until
there's a compelling story for them.