- Optimize VillagerTradingManager, avoid redundant work. Closes #10577