FoldAndPair plus multiple small corrections (some in ECGroup)