Consolidate clean and canonical_url

Create a new filter called 'canonize', and replace every instance of
clean and canonical_url with it.

Fixes #984.