Dispatching minor changes before a big refactoring.