Tony Vargas
Legend
The only quick-and-dirty solution that I can think of would be not to eliminate stacking, but just unnamed bonuses. If a feat gives an unnamed bonus, it's a feat bonus. Power, power bonus. Item, items bonus. Race, racial bonus. Class feature, class bonus. No exceptions.And a leader's bonuses would just have to function with that in mind. That's well onto the 5E path, though. I think that horse has sailed on this edition without a lot of hacking.