Move `short_to_chan_info` into standalone lock