Fix break/continue outside of while; replace with returns
Merge defines.php