move put_then_callback, take_then_callback into csp.impl.channels
fix None instead of CLOSED still being used in some places to signify closed channels