include improvements suggested by A. Egli

2 jobs for 185-refactoring-cleanup-agents_static in 40 minutes and 51 seconds (queued for 27 seconds)