Created by: bobheadxi
Applies review comments from https://github.com/sourcegraph/sourcegraph/pull/36335
