Yeah, but `self.xml` has the whole `ChoiceGroup` in it. I am still figuring out if there is a better way.

An alternative is that we do the stripping on the batch jobs. Thoughts?