Changes to comply with Style Guide version 1.1.2.

No hard tabs,  2 soft spaces. Oddly, some of the code was already in compliance.