Dhm/acid aside

@cpennington review (incorporates the other PR and I may should move some of these into that other one)
Nit: I'd tend to do:
```
url_base = "handler"
if thirdparty:
   url_base = ...
elif isinstance():
   url_base = ...
```
to prevent unbound vars and make things more readable (sure that's debatable...).