Some term traversal cleanup

First possible breaking point, but heck, term traversal isn't fully
operational anyway :)