Correct (again) 16-bit increment and decrement wrap-around behavior