some more cppstack cleanup