Fix if_return dropping the alternative.  Close #413