Both channels work now.

Cleanup for submission to the ml