Merge "Fix signed/unsigned comparison that was upsetting clang."