Fixing some subtle bugs in dependency code.
Fixing C++ wrapgen. Removing vestigal code to that effect.