Corrections on recent accidental introductions of tabs

A few PRs got through recently with tabs, this fixes that.  Files which have had tabs for a long time have been left alone.