A little refactoring cleanup.