1.0.45.19: more comprehensive CTOR optimization, part 2