Some minor improvements to read_msg_fd() made it safe to use both