Tooltip changes

This is following a discussion with @7sharp9. Not ready to merge, but does seem to work. Intended to rationalize the {Resolver,Tooltip}Provider implementations.