Fix: Rename variable for clarity.
Add: Omitted docblock comment.
Fix: Ensure that we always trim tokens, tweak tests to verify this.
Fix: Partial cleanup of collection building.
Fix: Make collections immutable by removing setter & add* methods.