Complex: fix diagonal case.  Simplify sqrt.