Simplify channel modes (#42)