space after commas throughout...and should `piecewise_fold` be done first in both cases?