Use the more clear 'message-id' flag for diagnostics.