saner structure, removed yacc.