Also rewrite it a bit for clarity (IMO).

LGTM=pzm, r
R=pzm, adg, r
CC=golang-codereviews
https://golang.org/cl/96560043