Improved ISO 639-2-to-3 conversion, redux.