Minor cleanup.
Correct collection matching issues.

Also bump version for minor point release.