More string cleanups...