Improve intrinsic exporting again