Get rid of resolver-fn in *-ref