(bug 1716) More work on the feed canonicalizer