bridge_softmix.c,channel.c: Minor code simplification and cleanup.