Cleaned up publisher/exporter TODOs.