Tidy up changes

Extracted improvements from a later commit which are orthogonal to the
purpose of that change.

Bug: 236624675
Test: build / treehugger only
Change-Id: I10d9a227cdde0f87e091cab23a67d7e49ebc7d15
12 files changed