I'm going to address this in a separate PR (after this one), so as not to hold up this PR.