Fix expr_to_config to support pchoice