[perl-Starlet/f18] (7 commits) ...Merge cleanup.