Follow up on post-merge code style review
Created by: olafurpg
Original review https://github.com/sourcegraph/sourcegraph/pull/21703#pullrequestreview-708695838
Created by: olafurpg
Original review https://github.com/sourcegraph/sourcegraph/pull/21703#pullrequestreview-708695838