Optimizer tweaks.
Add subsystems for comparison.