Avoid 386 O3 codegen bug even more