Allow for DEBUG=False and tidy HIF.