Fix #1815 again by considering Union == Declaration to be false and finding a whole bunch of places where we were using == and != which weren't found before.