Restore most debug position information.
Misc cleanup.
More dead code.