Fixed parser types. Still failing tests, but no runtime errors.