More cleanup of strings.