misc cleanup to support manual refresh of saved exports

should be no user facing changes.

wait for build
Does the caller do anything other than iterating over the tuple (e.g., index into it like `tup[index]`)?