Minor String cleanups (including one fix for clang++)