Improved support for jsonp callbacks