Merge "API review cleanup."