Split "if" into "return..if" and "when"