peep: more bugs

R=r
CC=golang-dev
https://golang.org/cl/4176042
2 files changed