remove trailing wheres in Univalence