Trim out leftover stuff from the last refactoring.
One more refactoring cleanup.