Add trivial-channels per #594.