Revise STIX import code to match new export code. This is untested and will likely still need a few more changes.