Now invokes UrlDigestFallback correctly.
Plus minor cleanup.