Fix invocant-unshift handling.

Was exposed by wrap.t, but could have come up in a variety of ways.