Numerous improvements in @CalibrationAnalyzer.