Optimizing JSONP template

Allowing for both ‘callback’ and ‘jsonp’ parameters, and reinstating
‘messages’.