XSDs from [MS-OFFMACRO2]
VBADataPart now has JAXB representation; VbaProjectBinaryPart now extends OleObjectBinaryPart.
VBADataPart works for a docm; I haven't seen an xlsm with a VBADataPart, so will have to wait til one turns up to get this right.