Trying to restore some diagnostic information to CompareAgainstBaselineCallable.