Merge "API cleanups."