Lots more export cleanup, until godoc looks sensible