Reformat the string output to be more in line with the decisions made in #3465