Further improve utf8 cleanup.
Use new hash key syntax.
Check for directories not files.