Merge "API review cleanups/changes."