Bit more rejigging, fix i386 secondary case
    
    Broke the i386 secondary case with the previous rejig (by moving
    where we fix i686 to be i386). This fixes that and again makes
    readability better.