Fix a bunch of arg passing.