Changing Finders to use CHECKs with callbacks,  instead of PATTERNS