Improved base class analyzer.