Fix constructor invocation check
Fix statement arity check