That said, it would probably be easier and would keep things moving if those kind of changes (cleaning up traits) was done as a new PR, unless someone plans on working on it very soon.