Fix many .WHICH related issues:

- some cases typeobject.WHICH would fail
- other cases WHICH method could be simplified