rebind: incorporate review comments