Fixed some more Perl::Critic level 3 errors.