assorted cleanup

R=r, iant
CC=go-dev
http://go/go-review/1025024
10 files changed