1.0.45.18: more comprehensive CTOR optimization