Addressed previous PR comments.

Test Plan: go test

Reviewers: Tobias, andybons

Reviewed By: andybons

Differential Revision: http://phabricator.cockroachdb.org/D57