It's the result of a refactoring which is needed by the contentious changes which were originally part of this pull request.  I removed them but didn't realise the refactoring wasn't used by anything else in this pull request, which is why it looks funny, but if you view the individual commits it makes slightly more sense.