Fix listing teammates as opponents
A pair of cleanups