Keeping two copies was getting too confusing.
Per suggestion from Daniel, make several Requires violations "Otherwise the program is ill-formed."