Completed transition to Handlebars helpers