Various fixes to the nesC grammar to improve its handling of complex input.