Mrproper/typedep reorder

It can also be an ast.Name