Changed heuristics to detect variable constructor initialization syntax (#6071)