Turns out we have a few that call with 5.  Added another commit to set a hard limit at 6 args.