Some improvements based on the addition of parentheses to html/template