L1: cosmetics. The criterium for triplet merging was stored directly in the q/p error. Move it to a multiplier PickNeighbour.
This MR should be merged after !422 (merged)