Argh TRIED to rationalize USE_AND_PAR vs USE_PAR_AND before and messed it up somehow.  Fixed now.