Final changes to grammar-ideal