Code review -- simplify changes.  Added flag to findMatchingFunctions() instead
of duplicating most of it.