Move more rules to base grammar