Fix clf-check tool to work with recent changes

This merge request fully fixes the clf-check tool to work with recent design changes, resolving an error seen in production.

cc @thomas-massinger, @duncanmmacleod, @reed.essick