The problem that this solves went away with #72

As that PR indicates, it may not be an optimal solution. This may also add better support for return arguments.

I need to do some manual testing and perhaps add some more unit tests, and then can make a call on whether the existing solution should be replaced by this.