Any comment on the "Cleaning up" part?
It's the most invasive part of the proposed changes IMHO.

Sorry, forgot saying that it looks good. BTW don't be shy to propose such patches directly, seems like you know how to tidy up things If I see something no-no I'll tell, but that seems unlikely.