Convert more stuff to std:: now we've fixed Doxygen