[#2750] Simplify the template yet more