Speed up type resolution some more. On the testcase in PR224, for example,