Changes to typedef and dump