(one-line functions will be re-established once we have all
formatted uniformly)

R=r
http://go/go-review/1023004