some cleanup and progress on std::deque