Try again to fix our handling of MOVD/MOVQ