fixup! Avoid using a delegator class

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Organize a few more imports

... while at editing those files anyway.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>