Fix #435 again: Explicitly construct URL objects for URL manipulation