Revert "Fixed some places in BasicFormatter where non-templated string types were being used."

This reverts commit da3882e77f0fce20db49e96d3bf13f386a01ed4e.

This is fixed in the "wstring-fix" branch instead.