Minor cleanup to help localizers

Change-Id: I855d900b004835271f1f96372e12556c5c025071