Merge "don't trigger an integer underflow when decrementing."