Minor refactor to try to be consistent between the lumped and gridded AWRA calibration applications.