Remove IsGroupoid assumption...