[yacc][Go] Tidy up tokens