Move freeze dodging into normal freeze code