Unify equality types and move <=> computation out of whnf

Resolves #3