Merge "Fix -Wsize-comparison failures."