Includes some loop condition fixes after fuzzing. The previously identified regression (#43641) is now fixed upstream.