or should we keep the "fix encodings conversion" separate from the more cosmetic stuff?
Well, ATM its just tests and fixes AFAICT, not sure what you see as "cosmetic"?
PS sure its several fixes, but they are all just part of making encoding work correctly, or as correctly as it can be made to work without rewriting.