Tons of parser fixes. Transition to something that is not exactly friendlier, but would match better some APIs in the future.