Subqueries don't bork so much now, so we can reduce the amount of processing done in python