updated term_walker and changed to a switch statement to catch future omissions (c.f. Issue 749)
expanded switch statements
Merge branch '749_update_term_walker' into next