Refactor to keep jsonp on by default, but configurable.