Better handling of clean directories.