Follow-up to Bug 1096444 - Really try and get all the directory depths right this time. r=nthomas