Enhancements and cleanup driven from the FindSimilar project