Cleanup
Fixed calculation of number of type arguments for type aliased constructor usages #SCL-6561 Fixed