More autoescape fixing.