Draft: Handle calibration constant variants
Pointing this MR against the huge correction-runners-as-friends
.
As usual, this will probably become a headache once that one is merged, so may then just close this MR to cherry-pick these changes to a fresh one.
Just putting it up for visibility and so I don't end up losing these changes in a stash somewhere.