Realign key-value pairs in arrays in service definitions

You started it, now finish it, too.