Yeah, I saw too much variation in the schema.org implementations to try refactoring, for fear of losing some of the nuance.  For instance, some fields have no microdata, others have a single span, and yet others have nested spans.  Does the refactor allow for this flexibility?