golint
Eliminate intermediate variable in tests
Merge pull request #1 from peterbourgon/master

golint and minor simplification