follow up r53582: Move escaping to the outer message for consistency. Per suggestion...