Performance issues on manage groups page and exporting primary fields

We have run into some performance issues on the manage groups and when exporting primary fields. The main commonailty seems to involve having both smart and regular groups involved.

This appears to be involved in adding an "OR" Statement to the groups inclusion clause. This is generated at lines 2558, 2855 of CRM/Contact/BAO/Query.php

Seamus