Remove some code We use scratch-flags to short-circuit this function. No need for previous early loop.