Nice refactor, I never liked huge `if` bodies followed by a tiny `else` clause.