Bringing OOXML definitions more in line with the reference