Fix valgrind failure. Don't try to remove a decl twice.
Simplify and disable assert until the issue is clear.
Reset the diagnostics in the decl reverter.