Improved logic around consistent message_id fields

Execution order in a mutate isn't defined, so use two separate mutate
filters.