Circle was in Prop.  Now it's not.

Instead it's in Set, which is fine.  Also, fix definition of eliminator
as per #122.