More work on HL7.org structs