Adjust import.
Give unification an explicit expected/actual distinction.