This ensures it is called before anything is deleted. Also, assure
the data array is never deleted by accounting for <= rather than
< causing an off-by-one error in the initial allocation...

Change-Id: I8a9e6f6ab00b93eeec391317d61e3ebc88880233