Linter cleanups that were left from merge with tutorialoverlay.