Minor refactoring around channel identity