Reduce the level of indentation...
Partially fix the automation situation, the real fix is going to require
re-organizing the data structures...