Yup, part of the refactor.

Done.