Code cleanup, prep for organizing new logic-loading system to move
code out of the core 'app' system and into the business-logic files
entirely.