Formatting fixes generated by xmllint --format