While preparing for integrating the UP planner, I polished the planner scaffolding and surrounding code a bit.
