More support for @ in templates