Added an extra slot (original-url) and moved around some fill-out
functionality to better support a world where redirects are possible.
Added an exception for the javascript:// scheme.