(this comment goes with line 721 but github won't let me comment there as it is out of the immediate diff context)

can we rename ret to stubReturnValue?