Get rid of RETURN/redo

See http://issue.cc/r3/2121 for details.