Fix trunk breakage due to chan->lock being renamed.