Improve type property handling.