Update to match change in core

Generics removed from Message/MessageChannela and related types.