Adjustments to the new nesC grammar to handle various 'real world' constructs encountered in realistic programs.