This has been stalled for over a month. Is it distasteful that we're working around a compiler bug in this way? I'll admit I don't understand why, given that we've worked around compiler bugs before quite often (and in uglier ways, I think).
We could also restore __force_align_arg_pointer__ instead, but I don't see how that's preferable to this approach?