Performance tweaks for StrategyExecutor (hopefully)