Could we perhaps do this as a future refactoring rather than as part of this PR? I agree BTW :)