GitLab

Minor cleanups to the code base. Preparing for future changes.

BUG=843987,802068
R=agrieve@chromium.org, pasko@chromium.org, rmcilroy@chromium.org

Change-Id: I65598259521b3e21b540cedadba99cfa58f13051
Reviewed-on: https://chromium-review.googlesource.com/1169480Reviewed-by: agrieve <agrieve@chromium.org>
Reviewed-by: Ross McIlroy <rmcilroy@chromium.org>
Reviewed-by: Egor Pasko <pasko@chromium.org>
Commit-Queue: David Turner <digit@chromium.org>
Cr-Commit-Position: refs/heads/master@{#582088}