Refactoring to help avoid traversing terms twice
Refactoring to help avoid traversing terms twice

GaloisInc/saw-script,GaloisInc/saw-script,GaloisInc/saw-script,GaloisInc/saw-script,GaloisInc/saw-script