Fixes to the nesC grammar so the parser test suite now passes again.