Finished overhaul of @CalibrationAnalyzer.