Fix oversights after refactoring.