More export cleanup, eliminate str/int casting