Merge "Fix -Wasm-operand-widths warnings"