Applied xml_pp tidying here too. Let's see if it's a bit more mergeable with the work config now.