We've gotten rid of `instancename` but not `typename`?