We could! I can do that in a separate general clean-up PR.