Improve restrict pattern to a subgrammar item