Restore correct annotation of movexy.
Uh, stacktrace is a bit easier than I'd made it.