A few more potential bugs relating to ++ and -- squashed.