Fixing odd indentation issues

Apparently having cindent enabled was doing weird things in a variety of
files.