[perl-Starlet/f18: 7/7] Merge cleanup.