Greatly improve robustness of duetto native constructor rewriter