Minor MessageToMessageCodec tweak