Some final fixes and simplifications

9 jobs for cumulant_method_rework in 165 minutes and 3 seconds (queued for 1 second)