switch analysis2 to use native constructor invocations