Migrate from size to byte_size and tuple_size