tidying up yacc