Squashed version of #18313.
---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix (partially) #11416
- [x] There are tests for these changes
Source-Repo: https://github.com/servo/servo
Source-Revision: 1f9182507f1a671dc2f1f9425b19cf1becd88c73
Squashed version of #17808.
---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix (partially) #11416
- [x] There are tests for these changes
Source-Repo: https://github.com/servo/servo
Source-Revision: 77afc3f33a72627fd4d6e83485722f3b38ae8420