Switch more stuff from tags to channels.