Merge invokes into one, handle move result not getting called, fix argument parsing in invokes.

Just a small one, fixing up a couple things wrong in the last one.