The only non-move changes here are whitespace changes to pass the `whitespace` test and a few testsuite adaptations.