Time: make capitals-aware.

May want some additional aliases.  I'd like to keep the full city data,
even though we only pick off a few pieces.