Minor fixes for the new analyzer.