Move replace and swap to std::mem. Get rid of std::util