Tweaks to fix the Language Spec.