Further code improvements to handle MS and direct PDUs.