Applied fix from trunk for revision: 981123 === The database check attempted to only check each helper once; however, the Set used to track whether a helper had been checked was *inside* the