Fix a couple of -Wsign-compare warnings introduced in r217556