Cosmetic Cleanups Incidental to Next Gen Modulestore Implementaton

@dmitchell: Please review to make sure I didn't mess up the contents, and add other reviewers to validate the changes.