More fixes of messy tab->space conversions

I did this by running a full comparison with BeyondCompare between Heater's initial commit (a76f883e9bfd146345f39f2db43420a4cca49e70) and the latest version, and making sure that my files ONLY contained the bug fixes but NOT the tabulation/spacing changes.