Fix remaining comments from D61944

Test Plan: make test

Reviewers: cramer

Reviewed By: cramer

Differential Revision: https://tails.corp.dropbox.com/D61988