Merge "init: more unique_fd, less goto"