More cleanups based on perlcritic output.

Change a few multiline print blocks to heredoc prints with double-quotes.

Align more groups of assignments.