Refine #binds and #connects behavior