Avoid return and callArg* clearing each other's state

Avoid return and callArg* clearing each other's state #646