See merge request !36 and merge request !34 - Fixup "[feat] zc.recipe.egg: Support on the fly patches."