Add PortableMessageSet to get around inner class issues.