eliminate funext (mostly) in Modality.v