Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #357.
This is #594, rebased onto develop, and then partially rewritten to fix the bug mentioned in #594 (comment) (which required a near-total rewrite of the TokenPartitioner, as the approach taken in #594 was wrong and was the direct cause of that bug).
All unit tests pass, including all the unit tests that were in #594, plus a new unit test to test the bug from #594 (comment).