Fix exporting circumfixes and terms