More Refactoring.

Again, no visible changes. My favorite.