>I am either going sane
A distinct possibility. Some of the DTM code was "whittled" rather than
designed, and could probably do with a cleanup pass.
I agree that the second test seems to be redundant; it was probably
block-copied from somewhere else or is legacy of a previous version of the
code.
I'm not sure what you're talking about when you suggest moving the code
that test controls... wouldn't just making it an unconditional part of the
outer conditional block be the appropriate change?
(We should also probably reconcile the indenting styles. The method you
pointed to is somewhat overintended when viewed in a normal text editor.)
Re hasNSDecls: I'm not sure whether the right fix is to set that, or to
remove the clause controlled by the if...
