Updated patches are rebased on top of merged channel support. They additionally move some definitions around to hopefully reduce the chances of future merge conflicts.