Fix errors inserted during untested refactoring.