Let's make this more consistent / readable.

Change-Id: I6a14c658961ce6de271c34e478d797de2bdbbc78