Added #CHOICE for standalone choice expressions