Hello,

As the various comments in the code explain, it's firstly wrong and 
secondly superseeded by fixes to inside main func.  This finally yanks 
it.  The follow on patch will yank the corresponding symbol table stuff.

I'll commit this part in a day or so.

Andrew