Use new ChannelError in HTLC-removal msgs, filling out more handling