language changes: {,Total}{Eq,Ord} -> {Partial,}{Eq,Ord}; some renamings to avoid warnings.