Minor refactoring to thread the channel ops