Revision 21064 helps this a bit, by deleting one pass, and causing some tests to be run only in 
one of the passes.  More work is needed though.