More xAOD-ification