Parser

- Made use of the other ::collect variants.
Merge branch '2.4.0' of ssh://git.tasktools.org/tm/task into 2.4.0