convert various places that access the channel lock directly to use the channel lock...