Second attempt at fixing formatting.

Occasional, unexpected indentation persists in several places (namely
in practically every statement that sets a variable equal to variables "h1"
or "e"). Perhaps there were unintentionally inserted tabs.