Add support for Perl::Critic testing.
Minor code cleanup.