Avoid return and callArg* clearing each other's state (#2593)

Avoid return and callArg* clearing each other's state (#2593) #647