Fixup after refactoring.