More changes to type handling