Fix language mappings (last commit was missing parts). Use better disambiguation of language variants.