OK, actually added a failing test this time. Let's call that last one refactoring...