Be strict about what options can be passed when --child is passed, and also fix a bug with passing timeouts