yaffs: More mainlining cleanup