fmt: Remove dead code and make comments and variables consistent.

R=minux.ma, dave, rsc
CC=golang-dev
https://codereview.appspot.com/7064055

Committer: Russ Cox <rsc@golang.org>