use arrays to avoid calls to Set.remove
Authored by: thibautd 2014-01-13
Parent: [r27429]
Child: [r27431]