Attempt to fix nebulous indentation complaints and also re-set after the includes.