MockFolderTest.moving pointed out a refinement to 1197e0ce: list folders, if included, before their contents.