Some refactoring in ClassBrowser.