callgraph and fileutils now using predicate_options framework.