Add space between , and next variable.

Also indent by 6 or 8 instead of 4 in these situations.