wv_correct: Code cleanup
wv_correct: Tweak corrections for TDI 32 and 64