Analyzer code simplified.