Both had excessive spacing, and they were also not consistent with one another. (cherry picked from commit 20c24e02)