rework prefer-ref-bindings