Use internal macro instead of hardcode datatype size