Improve the template tags.