Working on some clean-up of the parser (more cleaning to come!)