wip type subst in term

yuck!