Fix some insane code in the MessageSink