There weren't enough checks that we were truly in a native-comp build of Emacs. Not the most elegant solution, but the CLI rewrite handles this far better so it'll do for now. Fix #5131