Core/Battleground: Small code optimization