COMP: Instantiate less types in the DoIt macro.

Reduce memory usage, build time, and clean up dashboard
(too many types are causing internal compiler memory errors).

Change-Id: I31dbd3a20e7bbeeabab86aa055865bac7ae7b2a6
Merge topic 'LessTypes'

7c916ea COMP: Instantiate less types in the DoIt macro.