This specific refactor should likely also be tested.