Collation is more intelligent. Fixes #21