Improved handling of User-Agent: Should be able to remove.