Perl::Critic fixes.
PerlTidy improvements.