Preferably, yes. Clean-ups like that can be separate commits.

Yes, I think types.path is relatively new. Actually, according to git, it's from 2012 (040cf06388b1d5d94c0087c0243fd8fcf2502dce). A bit older than I thought.