Oops, that refactor could have gone a bit better ;)