refactor: Remove more @scalar-opt
#19666
+120
−122
Merged
Loading