Refactored an analyzer.