The HTTP thread is now started unconditionally rather than trying to
start it only when required.  Also fixed some formatting issues.