What about ellipses and cylinders? They are between circle and square
Ellipses is just a circle but it is elongated which is allowed. Cylinders as will just make the lists too large at that point just allow all regular polygons.