issue 6855: rename in "<return>" and remove $return command