Formatting + fix an alloc/init on separate lines.