More /analyze fixes.