This fixes #7805.  The analysis is working again.  I streamlined it and made it MUCH more efficient.