Simplify simple urls

This depends on #2001, so do not merge it before that.