Improvements after suggestions from Lauri, see merge request

14 jobs for refactor-tasks in 27 minutes and 42 seconds (queued for 3 seconds)