Remove some now-spurious exports, export conditions, use uninterned symbols