Simplify some input validation by moving channel instantiation