Update for extensions changes and fix double mounting.

Update for the switch to `TypeMap`.

I also fixed double mounting, which I'd broken when I introduced removal of the original URL...