Removing TT macro and std::string use