Changed parser builder interface to make testing easier.