Unify closing/dispatch disconnect; and make close work