maps: fix golint's problems with maps