Revert "Stronger and shorter type signature"

This reverts commit 36049b65.

3f0fff98 failed to make Run.java compilable; and this commit introduced a rawtypes warning in ArtifactManager.
Provisionally switching back to originally type signatures which at least were accepted by the compiler, if not optimal.