Change a bunch of stuff to use phrase instances instead of string tokens (including the planner) Mark the methods/fields for using string tokens as obsolete