Tweak formatting for hacking.

I'm about to bring in regular project infrastructure, this is a
prelude to that.

Change-Id: I58031c196ee4105a4f51c99bf7a9ad3a29d84c6b