Fixes to auto-indent / "normalization" spree done by PyCharm

Please test before committing automatic redefinitions of every line of
a script to master.  PyCharm did do a pretty good job overall, but it
(or Meneth, I can't tell which) did some really wonky
non-indentation-related stuff too that would break functionality.