ZZZ
ZZZ
ZZZ
ZZZ
ZZZ
Fix constructor instrumentation.