Remove some uses of the SCARG macro.