[patterns] Disambiguate identifiers in the pattern grammar.

There are no user-visible syntax or semantic changes here. It only
changes how the grammar is organized.

Fix #2714.