Code cleanup for commit c6edbb6 "Switch to Perlbrew and Perl 5.16.3"