Moved conformity timer update out of now-smaller thresh update loop