cb types - initial progress

Temporarily added some cb's back into the file just to make it easier to
do a compare. Have only made a pass through the first few CB's at the
moment--feel free to double-check any changes. Most changes have been
minor at this point, mostly adding in event forces disbandment.