Modest refactoring of code to enable architectural clarity.