Additional tweaks to handle methods with variable numbers of args.