Move arg count check down