Add BLOCKING_GROUP and BLOCKING_BRANCH classes to distinguish between blocking and non-blocking forms of choice group.