Corrections to CalClock comparison methods, incorporating potential
location changes.