Add NameSupply and finished ast for types