Fixes #30739
* Refactor: No more than 1 namespace declaration per file * Simplify refs where possible