Extensive rewrite.  Still needs teaser results.