remove use of unevaluated objects from _expand_hint