Remove uses of deprecated arg variable