Remove more private categories.

(Clang finds all methods in files now.)