BSD style fixes.

Change-Id: Ib5012f3508c8f94b727a389e9c89a80a0f17dde4