Prevent future instances of the last bug.

Also make the columns line up, and make it visible in the code that they
do now line up.

Bug: http://b/26084907
Change-Id: If6abfffcafceab8e8d548c93fbbb13e371c79732
2 files changed