Fixes golang/go#5709.
Fixes golang/go#5811.

LGTM=dave
R=dave
CC=golang-codereviews
https://golang.org/cl/21360043