More work on xmi serialization.