Reinstate this optimization, but without the miscompile. Thanks to Bill for