BattlescapeState: cleanup & tweak