Fix a few issues with collation as a trait.