Handle type resolution consistently and without special cases.