[perl-Plack/f17: 4/4] Merge cleanup.