Limit size of typeNames list.

* Logic error in typeNames list construction over-generates values