Fix rustfmt'd short ChannelManager methods

In the previous commit we formatted a bunch of short methods. Here we clean up
the default formatting that rustfmt applied by extracting code into variables.

Author: valentinewallace