Simplify, now that gtest supports raw_ostream directly.