Proposal to make Channel.Unsafe interface less hacky

Proposal to fix #1557