(Fixed indentation mess and some other formatting in JavaCC jj file)