Zap 'url' from JSON.

Paul's client-side traversal stuff can construct it.
Fix merge conflict.