It would be easier to review if you separated the very trivial changes from the others. The size_t change is clearly fine and can be approved quickly. The refactoring requires more attention.