Further cleanups of CBT based sorters, and removal of C++11 features not available on older compilers