More code cleanup.  Now exporting nMatches for eventual use in the pi searcher.