I'm not 100% sure that integer sizes are correct in the catalog. Do we use them anywhere?