Lots more parser improvements.