further attempts to make 'BuildDefeatsMatrix()' more readable