Fixed parsing of optional parameters; changed Choice to use optional parameters correctly.