Reorganized independent generators.
Added 3 subtly-dependent generators.