DNS consistency pass

Now with less inconsistent indentation.