simplify handling 'return'