Allow text-provider to be something other than "annotation" if it's set.

If the Text-Provider is set, switch from the default of "annotation" to the one specified.