Unified code base.

Now that IG is the point of reference from which divergences may be made.