Fixed #173 - 'return ' is now added/removed in Eval steps during version conversion.