more Perl::Critic fixes