More refactoring of Wiiclassic driver