Replace some awkward x-to-string with C++11/14 idioms