Bit more post-refactoring code re-org.