swift

[Constraint system] Minor cleanups/refactoring ahead of function builders refactoring

#27629

Merged