Ok if you change your mind, just make sure the cleanup of the "if" is in a separate commit ;)