Remove PTData holder and and simplify some of the redundant fields in the
channel.

Silence some more of the iOS 7 SDK warnings.