Some cleanup in calibrate.py

Various simplifications and cleanups I noticed were possible while trying to work out how to test !330 (merged).

Indentation changes make this look bigger than it is: try viewing the diff without whitespace changes: