Apply type on instantiation.

SUP-1689 #time 20m