Thank you! I think including E might work out for a d4, but it feels elegant to just reroll and move on.
Does it read clearly how to generate a d20 off two rolls? I think all the rest of the polyhedra could be faked as well, but that can be an exercise for the reader.