Removed a redundant local; misc. other stuff.
Fixed a bug in commented-out code.