Some fixups.  Identify a knotty spot.
Unbreak announce.
Remove some unneeded templates.
Remove base_key, key_ext, and fix templates more.