Restructured super-operator construction to avoid N^3 problems.