Improving support for Snippet Templates.