Eliminate one choice with CPP in exports. No functional changes.