[CF] Small refactor of Recover() and DumpManifest()