Moving from it/else to case could be a separate commit.