This completes the Grand Refactoring.

Bug fix - cannot generate a JSON node of a complex type, so don't try.