Having got Jigsaw mode generation working at reasonable speed, we
can now productise it.

[originally from svn r7979]