Minor polishing in http space, to get them out of substantial change
to follow shortly.