Add commands to increment and decrement an integer at point
Pull in upstream changes