Committed as follows, after re-testing on arm, ppc[32/64].


r~