Tweaks to language handling.