This results in a much cleaner collectagent.cpp file and main function.
However, further cleanups are necessary and the respective TODOs can be
found in the code.