expandFiles and expandDirs are no more.