Simplify logic

16 jobs for !959 with 1126-complex-quantities in 47 minutes and 15 seconds (queued for 2 seconds)
merge request