Performance: Less shape changing

delete is more expensive than setting a value to undefined, especially when
used on a class-like object. Avoid using it on token data structures whenever
possible to avoid reallocations of objects.

Change-Id: I644d61513ec0634b6a222cd3cc99ac496bec0ac0