It would be better to keep mineral patches/geysers in the Expansion class. This would avoid extra calls to GetUnits() and enable easier income estimation for occupied Expansions.