Sounds nice but I'd appteciate if we left that for another PR. This PR's one and only purpose is to reduce the scope of the change so that we can finally get it merged.    @raboof was actually waiting for the original PR to be merged and closed their PR for the mean time.