Fix "Argument list too long"

Compliments of mistersprinkles from the IRC channel

PS2 - white space
PS3 - bad white spaces
PS4 - Ugh white spaces and errors

Change-Id: I09a512e13914e77d1441531acbd89a2b3b5ef289
Merge "Fix "Argument list too long"" into jb42