Optimizer cleanups.
Some struct cleanups.