Next attempt to fix the double-member issue in ClassBrowser.