Introduce getChannels and tidy up.