Slightly better int type mapping