Add back support for URL arguments.