Just when you thought you couldn’t refactor any more…