Improve import/export for split (still not passing)

Should be cleaned up at some point (when we work to get rid of warnings around opaque keys).