CB types comparison pass

This should be ready to go: nothing important from vanilla seems missing
and mod changes are generally understood.