more tweaks to Analyze_Line support