More progress porting the grammar parsing code over to boost::spirit::qi