Next round of cpio cleanup.