DE1605 Fixed whitespace problems in templates.