WIP: Avoid using NN clustering by default

Initialising from a default toolhandle avoids configuring the corresponding conditions algorithms. This required some unpleasant hackery to get around.

This MR provides an explicit alternative to the NN clusterisation tool, and removes the corresponding hackery.

Tagging @jmasik since he was interested