Fixed how ++ and -- work. More robust in contexts.