Making minor changes in prep for refactoring.