Work on rich typeof support