This is mostly in preparation for #5830 where I want to ensure that I don't introduce any regressions