FORMID -> cb_formid_t: missed two occurrences
User facing API type change: collection_t -> cb_collection_t