With the check here (where it belongs), we can remove the length check above.