Change illegal uses of ++ to uses of STLExtra.h's next function.