Wrap tokens and token in value objects.

[bmitch]

Could wrap the array of tokens inside a collection and each token could be a value object.