Eliminate some uses of wd2 - tests can be done on raw2 buffer instead.