More size_t related changes.