Bug 23823: (follow-up) Get rid of some tabs in favor of spaces