include improvements suggested by Ch. Eichenberger

2 jobs for 185-refactoring-cleanup-agents_static in 33 minutes and 43 seconds (queued for 7 seconds)