Pushed both to sandbox, thanks. I also made a bunch of cosmetic whitespace changes to several of the recent ppc patches, could you make a quick test to verify that I didn't accidentally break something?