Implement more of the deferred movement (untested so far, although it does compile).