Cobertura XML - minor tidying