Dropped nargs in args list; minor optimisations