Significant progress towards refactoring grep into internal and external variants.