Include missing part of r11275. Fix fw_argX from CFE