Clean-up HTTP URL matching code