std::rt: Some cleanup