Make use of the newer message objects.