Ticket #777. Cleaning up and fixing string/token safety check.
Ticket #777. Cleaning up and fixing string/token safety check.

sburnett/seattle,sburnett/seattle,sburnett/seattle,sburnett/seattle,sburnett/seattle,sburnett/seattle