A few more tweaks for #1584. Hero victory now always goes to world map.