McAvoy is exhibiting high levels of composure and situational awareness, specifically focusing on team discipline following direct league warnings while benefiting from a simplified defensive pairing.