This PR simplifies our spacer utilities a bit by cleaning up the variables for them. Instead of having separate variables for $spacer-x and $spacer-y, we just have $spacer`. The extra reassignment didn't add any value and we were only using those other variables in a handful of places.
Overall, just a small cleanup with two variables being removed (and one being moved down the file).
Fixes #21836 (closed).