Updates to address Tobias' final comments to D61.

Test Plan: none required

Reviewers: Tobias

Reviewed By: Tobias

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