remove a few explicit uses of $@