I'll merge this as-is, but reminder for the future: variable names on a new line should be aligned with the first variable on the previous line.