still further attempts to make 'BuildDefeatsMatrix()' more readable
moving statements around in order to more easily compartmentalize them