failing test for #1472
font-url(/path, true) image-url(/path, true) #1472

Fix bug in the URL helpers and clean up duplication a bit.