Replace more a*'s with arg_*'s, thanks to Gabor Greif!