More work on Collation

Make the Collator class match the API for Unicode::Collate