Converted url-for-match from a named template to a function, making it much less verbose to call.