FIXED: Various fixes to SW grammars.