Almost done with type parsing