Fixing overenthusiastic XML escaping, and some indents

Left some old code in by mistake. This removes it, and also corrects an indent which looked odd.