ack, forgot to add witness markers to base/splay
qualify termexpr vars too