More PPC32 -> PPC changes, as well as merging some classes that were