Fix .h, move to use of std::swap.