Pull wrap-fn-bindings out of wrap-overloads and wrap-letfn-bindings