Also a good point, but same response as above. I'd prefer to leave that alone in this already-large PR.