performance optimizations
removed Eq and refs to Eq.equals