Use new MessageMetadataHelper in a few more places.