Use the NS_*_CB macros instead of having ifdefs everywhere.
Merge branch '20141104-nsdispatch-macros' into markj-develop