WIP: Optimize traverse

Optimization traversal is currently broken.  This helps to unbreak it.  More later.