[builtin] Add and clean up "too many args" errors (#2589)