More refactoring
More refactoring

CantemoInternal/pyxb,jonfoster/pyxb2,pabigot/pyxb,balanced/PyXB,CantemoInternal/pyxb,balanced/PyXB,jonfoster/pyxb-upstream-mirror,jonfoster/pyxb-upstream-mirror,pabigot/pyxb,balanced/PyXB,CantemoInternal/pyxb,jonfoster/pyxb2,jonfoster/pyxb2,jonfoster/pyxb-upstream-mirror