Use SuppressibleTreePathScanner instead of rolling our own.

Use SuppressibleTreePathScanner instead of rolling our own. #5783