Most lines in these files are indented with 3 spaces. However, there are some spurious tabs as well, making lines indented wrongly unless the editor's tab width is set to 8.
Replace all tabs with 8 spaces.
In a handful of places tabs were used within a line instead of at the start. Insofar as replacing those with 8 spaces gave undesirable results, they have been fixed up manually.
The second commit fixes three mis-indented lines unrelated to tabs. Just happened to notice them while scrolling through.