With Combat feats (as a category) going away, does this change anything about the CMB? This has been one of the best innovations of Pathfinder IMO from the DMs side of the screen.
No more multiple formulas to memorize or find; one formula to rule them all (wt=ith the exception of Feint).