This is done in a separate commit so as to keep the original code-move commit mostly a pure code move.