Editing: canonicalize.go