Enable locate_file() to scour types. Merge versions.