Another reason to split out the MSG_DONE change, is to address David's concerns regarding polarity, which affects this bit too.