Fix analytic projection.
Cleanups.