Normalization and canonicalization should be extended to deal with local and global keys.
In short, both the normal and canonical representations MUST use global keys when possible and use local keys only when there are no global keys.
Denny to write the spec, and then have it discussed and agreed on, and after agreement hand over for implementation.