Fix accidental short-circuiting when comparing fds (& warnings)