change --save-analysis to -Zsave-analysis
more polising of externals