Attached patch does more cleanups on the eq code. Acked by Manuel.

-Jeff