Update rules for grako 3.0
Minor conveniences when building data