More cosmetics and little Perl-sanity fixes