Update Arc and Channel code to be compatible with rust master.