Non-functional changes to make Perl::Critic less unhappy.