I like the `-I.` ; what's next? `-I/.`

IMHO, ready to merge, it all looks fine.