Lots of changes for IDE exporter.