More linker bloat reorganisation: