Handle the larger amount of arguments allowed now

This entire check is probably going to be able to be removed soon, but is nice to have it current for now.