Revert "modified wnat" as it is not the corrext fix.

This reverts commit 3ad3513682730110b61b1b23ba7201ecd2e7eec1.
Sprinkle some asserts in wnat.
Fix node marking corruption.