Wrong enhanced notification message format used?

[patrickslin]

I was looking through the Notification class and I noticed that the message packing is such:

def message
      data = [device_token_item,
              payload_item,
              identifier_item,
              expiration_item,
              priority_item].compact.join
      [2, data.bytes.count, data].pack('cNa*')
end

But according to the Apple Enhanced Notification Format, the notification message format should be:

Am I wrong, or is the implemented notification format incorrect? Thanks.