Removed unused conditions.
Added urlpattern args to the return value.

Also simplified leftovers of the internal api.