More filename templating - in comments.