I almost always have a 2-cell in my EDC pack - two, at the moment. A SF G2Z w/ Malkoff M61WL and a G2 w/ Malkoff M61LL.
Which might be considered a bit excessive, I realize, but I also spend a lot of time walking and/or on public transit, so I like having a primary/secondary combo.