update typechecker with latest commit from David