More refactoring to simplify teammate fields.