CBQI BV choice expressions (#1296)