Static analysis fix: more dead stores.