Updates to code generation for extensible matchers.