Refactor to use list of offending items.
Moved FixHintPaths stuff to other script