Fix hangover from some earlier refactoring