Yes, we'll probably have to move StrategyHint as well as NamedHint. I have to admit, this is my least favorite part of this pull-request. Is there any way to simplify the "hint" concept? Any chance we can just use a String, and let the value of the string vary depending upon the kind of hint required? I guess I'm just not clear on how extensible it really needs to be.