Fix test-optional and test-any failing due to libstdc++'s non-conforming std::string

Remove some cruft from primary CMakeLists.txt