simplify various code using new map index rule
Russ Cox authored
R=r
CC=golang-dev
https://golang.org/cl/833044
c7122a3c