Minor mods to appease perlcritic.