Refactored how JSONP is processed.