Removed workarounds from definitions to/from XML.