Make combine_infill() completely idempotent. Includes unit testing