Minor code cleanup (mostly with newline placement).