Re-arch task processing

Mimic the MSU task re-arch:

* Merge task & cb_data structs
* Internal API cleanup