More Perl::Critic fixes