A little refactoring, preparing for a bigger change.