Make parser a bit more sane, but not done yet.