Fix context expansion for player arguments