I extracted the refactoring patch from a larger patch that contained other
changes too, but missed one unintentional change and didn't test enough...