Noted, but would prefer to do it separate from this PR.