[12.x] Use first-class callable syntax to improve static analysis

[12.x] Use first-class callable syntax to improve static analysis #8402