removed subset from lexer/parser, reverted changes from 8134a which don't compile properly on darwin/1.0.3
removed subset from parse calls