Restart this branch with a forward-port of 6fe8447a4651 and 9006ab2b1fae, with args to amqp_channel_sup:start_writer() rearranged to be more consistent.