Tighten the conditions under which we do PRE, remove some unneeded code, and correct...