Mostly, I don't bother with matches any more. A mini Bic in my pocket, a full-size Bic in each pack, and a candle or equivalent for tinder.

I sometimes carry one of the new super-hot flints, if only for entertainment. (Also, they're okay on airlines.)