A couple of fixes to ctrl-a/x: don't update the number immediately to the left of the cursor on ctrl-a/x, and ensure that this new code doesn't go into an infinite loop if we can't find anything parseable as a number at all + some other edge cases. Rename some local variables.