Author's note: For the refactor itself, it wasn't needed that 74 files had to be touched. That was just because I (as usual) snuck many little changes not related to this PR itself into this PR, because currently no one else is working on this, so therefore I could