Handle types better.