Tidy up whitespace

Converted everything to four-space indentation, as this was already in use in
the majority of cases in these files.