Merge "API cleanup and purdy-fication."