Some fixes to equivalence class handling.