@XmlJavaTypeAdapters for all of the enum type maps in ~.common + a few random marshal/unmarshal fixes