improve or/c random generation and get rid of old, not-working
generation for the old-style -> contracts