GenericParser now returns a . Fixing tests and minor things.