port box2d cleanups from c++11 branch to master