Further Handlebars-templates improvements.