Unlinke in previous such clean-up commits, there appears to be no sufficiently
exposed container type whose size_type could be used throughout, so resorting to
the generic std::size_t in this case.

Change-Id: I3cfbcbe5cce1bfcff2efbb4f8a509fe80ab12151