FIXUP: Move code for clearer diff.

To squash/fixup.