Remove some unportable integral type size assumptions