Follow-up r67094: Tweak message files