Restored fixes related to procedural coding which was accidentally removed
Restored fixes related to procedural coding which was accidentally removed

640Labs/pubnub,jzucker2/objective-c,opentable/pubnub,opentable/pubnub,jzucker2/objective-c,640Labs/pubnub,640Labs/pubnub,640Labs/pubnub,opentable/pubnub