Merge "Some new API cleanup."