Can roundtrip directories again after refactoring.