get things to typecheck by getting rid of termination issue.  Will have to FIX termination issue next.