Complete fix for --enable-complex rhs comparisons