Fixing a bug: need to get the right choice/event number for IntIntervalGenerator...