These were remnants of https://gitlab.com/kicad/code/kicad/-/issues/7865
Also tries to fix a compile issue on gcc.