AVALANCHE: Janitorial - Use ++ and -- when possible