Cleanup concept (canonical) URL hooks

This is a follow-up for I69985b4. I just clean up the existing
code and make the IDs consistent again (I'm sure I asked for
this in the original patch).

Change-Id: I36e0bc6d58a301d9b266fe280d7b22d5e3f07da5
Merge "Cleanup concept (canonical) URL hooks"