get rid of redundant keywords
make param-list in declarations sections consistent with param-list in grammar section
fix formatting issues in grammar section
add forward declaration to grammar section