Update grammars to match reorganization.