DRY up use of UrlMaker

Whitehall.url_maker provides the correct UrlMaker in these cases.