Give wadder.cpp a do-over.