some best practice & updated autogenerated files to work with latest JavaCC