fix registrant_choice by allowing no selection of event_choice with optional_if arguments