Split into individual definitions, one per line

Change-Id: Ib64def97e04273e66f7a2e514c49f0caecc10fe6