Jon Blow changed my mind about that refactor