snippet support: grammar changes
snippet support: code generation changes