This structure still feels a little weird to me, especially because of the new pitfall with untitled documents.  Just wanted to point out that we _could_ continue to use the old keying with its simpler lookups if we just did some simple fixups in the rename handler below (much simpler than the fixups on master, since the Files have already been updated -- we'd just need to check if the hash key still matched the doc.file.fullPath).