argument count check cleanup